Change-Id: Ia52237760d36f342d6b053525ca6617a1e722aab
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>