Merge branch 'MDL-57708-32' of git://github.com/merrill-oakland/moodle into MOODLE_32...