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