Change-Id: Iff39fdf8a58c7e844b087dbab7c112630d6c50ad Reviewed-by: Marco Bubke <marco.bubke@digia.com>