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