Merge branch 'MDL-55136_dataobject' of git://github.com/davosmith/moodle