Merge branch 'MDL-69273-master-2' of git://github.com/andrewnicols/moodle into master