Merge remote-tracking branch 'rapid7/master'
Merge branch 'master' into autoload