Change-Id: I5510295ec0dd631031402ca681b4275f1b4adb83 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>