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