Merge branch 'MDL-35238-deployment' of git://github.com/mudrd8mz/moodle