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