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