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