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