Merge branch 'MDL-68986-master' of git://github.com/merrill-oakland/moodle