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