Merge branch 'MDL-65809-master-travisphpbump' of https://github.com/snake/moodle