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