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