stick to minitest 4.7.3
Merge remote-tracking branch 'korny/dont-expect-active-record'
Merge remote-tracking branch 'upstream/master' into fix-firefox