Merge branch 'MDL-37566-m-integration' of git://github.com/andrewnicols/moodle