Merge branch 'MDL-52210-master' of git://github.com/cameron1729/moodle

diff --cc version.php
index ba2d4ff,8b2da70..868735d
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2016010700.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015123100.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2016011200.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.
  

diff --cc webservice/upgrade.txt
index 679399d,e69dea1..98234a9
--- 1/webservice/upgrade.txt
--- 2/webservice/upgrade.txt
+++ b/webservice/upgrade.txt
@@@ -9,8 -9,9 +9,10 @@@ This information is intended for author
    responses. Fault strings that were generated by Zend_XmlRpc_XXX_Exception exceptions (i.e. 'Method
    "[methodname]" does not exist') are no longer used which may display a different error message depending
    on the string returned by the getMessage() method of the thrown exception.
 +* The xmlrpc server is no longer enabled when the Mobile service is activated.
  
+ * Support for the AMF protocol has been dropped completely.
+ 
  === 3.0 ===
  
  * WS protocols webservice/myprotocol:use capabilities were defined with a high riskbitmask value