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