Merge branch 'rh' of ssh://git.auf/auf_rh_dae into rh