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