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