Merge branch 'MDL-49329-master-multiplug' of git://github.com/mudrd8mz/moodle