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