Avoid minitest version that breaks nested lets
Merge branch 'master' into issue-badges