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