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