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