Change-Id: I934622c2cf993255d92550731a2cd186943d697b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>