Merge branch 'MDL-45603-master' of https://github.com/merrill-oakland/moodle