775ccc7
Merge branch 'release-0.5.60' into release-0.5.61 Conflicts: beaker.spec rel-eng/packages/beaker