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