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