Merge branch 'MDL-50287-master' of git://github.com/danpoltawski/moodle

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

diff --cc lib/deprecatedlib.php
index 82eab5a,2758fee..9447503
--- 1/lib/deprecatedlib.php
--- 2/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@@ -2381,20 -2380,23 +2381,41 @@@ function get_referer($stripquery = true
      }
  }
  
 +/**
 + * Checks if current user is a web crawler.
 + *
 + * This list can not be made complete, this is not a security
 + * restriction, we make the list only to help these sites
 + * especially when automatic guest login is disabled.
 + *
 + * If admin needs security they should enable forcelogin
 + * and disable guest access!!
 + *
 + * @return bool
 + * @deprecated since Moodle 3.0 use \core_useragent::is_web_crawler instead.
 + */
 +function is_web_crawler() {
 +    debugging("is_web_crawler() has been deprecated, please use \\core_useragent\\is_web_crawler() instead.", DEBUG_DEVELOPER);
 +    return core_useragent::is_crawler();
 +}
++
+ /**
+  * Update user's course completion statuses
+  *
+  * First update all criteria completions, then aggregate all criteria completions
+  * and update overall course completions.
+  *
+  * @deprecated since Moodle 3.0 MDL-50287 - please do not use this function any more.
+  * @todo Remove this function in Moodle 3.2 MDL-51226.
+  */
+ function completion_cron() {
+     global $CFG;
+     require_once($CFG->dirroot.'/completion/cron.php');
+ 
+     debugging('completion_cron() is deprecated. Functionality has been moved to scheduled tasks.', DEBUG_DEVELOPER);
+     completion_cron_mark_started();
+ 
+     completion_cron_criteria();
+ 
+     completion_cron_completions();
+ }

diff --cc version.php
index 6165968,c562c0d..f30463e
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015090300.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015082700.00;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015090800.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.