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