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

Conflicts:
	version.php

diff --cc version.php
index 7b4d1f6,ce3d06a..6af1e52
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015030900.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015030500.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015030900.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.