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