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