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