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