Merge branch 'MDL-29256-resource-format' of git://github.com/mudrd8mz/moodle