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