Merge branch 'MDL-49398_final4' of https://github.com/sk-unikent/moodle

diff --cc lib/upgrade.txt
index 23520d7,3e5d416..09c2839
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -3,10 -3,9 +3,13 @@@ information provided here is intended e
  
  === 3.4 ===
  
 +* Added new moodleform element 'filetypes' and new admin setting widget 'admin_setting_filetypes'. These new widgets
 +  allow users to define a list of file types; either by typing them manually or selecting them from a list. The widgets
 +  directly support the syntax used to feed the 'accepted_types' option of the filemanager and filepicker elements. File
 +  types can be specified as extensions (.jpg or just jpg), mime types (text/plain) or groups (image).
+ * Removed accesslib private functions: load_course_context(), load_role_access_by_context(), dedupe_user_access() (MDL-49398).
+ * Internal "accessdata" structure format has changed to improve ability to perform role definition caching (MDL-49398).
+ * Role definitions are no longer cached in user session (MDL-49398).
  
  === 3.3.1 ===
  

diff --cc version.php
index 7af6e8f,2144f0e..78c9275
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2017060500.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2017060100.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2017060600.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.