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