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