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