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