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