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