Merge branch 'MDL-55923-master' of git://github.com/jleyva/moodle

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

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

diff --cc lib/moodlelib.php
Simple merge

diff --cc version.php
index 98baeac,0ab7567..50be8c8
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2016100700.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2016092900.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2016100700.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.