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

Conflicts:
	version.php

diff --cc mod/assign/externallib.php
index ef7d016,63a27ce..2f769e1
--- 1/mod/assign/externallib.php
--- 2/mod/assign/externallib.php
+++ b/mod/assign/externallib.php
@@@ -273,9 -281,8 +286,8 @@@ class mod_assign_external extends exter
       * @return An array of courses and warnings.
       * @since  Moodle 2.4
       */
 -    public static function get_assignments($courseids = array(), $capabilities = array()) {
 +    public static function get_assignments($courseids = array(), $capabilities = array(), $includenotenrolledcourses = false) {
          global $USER, $DB, $CFG;
-         require_once("$CFG->dirroot/mod/assign/locallib.php");
  
          $params = self::validate_parameters(
              self::get_assignments_parameters(),

diff --cc mod/assign/tests/externallib_test.php
Simple merge

diff --cc version.php
index 89dd620,13c48cd..2b2ee2b
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2016031700.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2016031000.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2016031700.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.