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