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