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