Merge branch 'MDL-69112-39' of git://github.com/merrill-oakland/moodle into MOODLE_39...