Merge branch 'MDL-38792' of https://github.com/ppichet/moodle

diff --cc question/type/calculated/edit_calculated_form.php
Simple merge

diff --cc question/type/calculatedmulti/edit_calculatedmulti_form.php
Simple merge

diff --cc question/type/calculatedsimple/edit_calculatedsimple_form.php
Simple merge

diff --cc question/type/essay/backup/moodle1/lib.php
Simple merge

diff --cc question/type/truefalse/edit_truefalse_form.php
Simple merge