Merge branch 'MDL-35104-master-2' of git://github.com/cameron1729/moodle