Merge branch 'MDL-34985_m23' of git://github.com/merrill-oakland/moodle into MOODLE_2...