Merge branch 'MDL-53515-master' of git://github.com/merrill-oakland/moodle