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