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