Merge branch 'MDL-57682-master-fix' of git://github.com/andrewnicols/moodle