Merge branch 'MDL-57259-master' of git://github.com/ryanwyllie/moodle