Merge branch 'MDL-68348-master-6' of git://github.com/mickhawkins/moodle