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