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