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