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