Merge branch 'MDL-70409-310' of git://github.com/merrill-oakland/moodle into MOODLE_3...