Merge from 1.9 as HEAD is different

MDL-16427 implement the '*' convention as for other questiontypes
MDL-15358 negative data and MDL-16427 handling 0
MDL-15233 tolerance

question/type/datasetdependent/abstractqtype.php

@@ -88,12 +88,12 @@ class question_dataset_dependent_questiontype extends default_questiontype {
             } else {
                 $str = str_replace('{'.$name.'}', $value, $str);
             }
-
-
         }
         return $str;
     }
 
+
+
     function finished_edit_wizard(&$form) {
         return isset($form->backtoquiz);
     }