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