Merge branch 'w12_MDL-29894_m23_objectparams' of git://github.com/skodak/moodle