Merge branch 'MDL-61132-master' of git://github.com/rezaies/moodle

diff --cc lang/en/question.php
Simple merge

diff --cc version.php
index 2bdfd57,281e3fa..8ffb816
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2018020100.01;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2018020500.00;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2018020600.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.