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