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