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