Change-Id: I33e8149ec9e2f7ecfebb7f55de0dbb291805be93 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>