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