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