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