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