Merge branch 'MDL-64640-master' of git://github.com/andrewnicols/moodle