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