Merge branch 'minitest_support' into kamerling