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