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