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

Conflicts:
	version.php

diff --cc course/externallib.php
Simple merge

diff --cc course/tests/externallib_test.php
Simple merge

diff --cc lib/db/services.php
Simple merge

diff --cc version.php
index 3b3fb14,c68af99..fae5fd2
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2016071400.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2016070100.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2016071400.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.