Merge branch 'MDL-31828_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

question/engine/datalib.php

@@ -151,6 +151,7 @@ class question_engine_data_mapper {
         foreach ($step->get_all_data() as $name => $value) {
             if ($value instanceof question_file_saver) {
                 $value->save_files($stepid, $context);
+                $value = (string) $value;
             }
 
             $data = new stdClass();