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

diff --cc lib/db/services.php
index 26c3e6d,af891e4..5fbbdf1
--- 1/lib/db/services.php
--- 2/lib/db/services.php
+++ b/lib/db/services.php
@@@ -1228,8 -1226,8 +1228,9 @@@ $services = array
              'mod_choice_get_choice_options',
              'mod_choice_submit_choice_response',
              'mod_choice_view_choice',
 +            'mod_choice_get_choices_by_courses',
              'mod_imscp_view_imscp',
+             'mod_imscp_get_imscps_by_courses',
              ),
          'enabled' => 0,
          'restrictedusers' => 0,

diff --cc version.php
index 6ea885a,260b8fc..d199134
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015092203.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015091800.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015092204.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.