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