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