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