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