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