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