Merge branch 'MDL-49565-27' of git://github.com/merrill-oakland/moodle into MOODLE_27...