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