Merge branch 'wip-MDL-52715-master-additional' of git://github.com/abgreeve/moodle

diff --cc version.php
index fe667ea,cfaa55e..594d902
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2016020201.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2016012900.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2016020300.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.