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