Merge branch 'MDL-60958-master' of git://github.com/ryanwyllie/moodle