Merge branch 'MDL-32985_integration' of git://github.com/merrill-oakland/moodle