Change-Id: Idedc365c1cdf73f6728597b87c7a807b25581a1f Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>