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