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