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