Merge branch 'MDL-53240-master-filetypewidgets' of git://github.com/mudrd8mz/moodle

diff --cc version.php
index 34f2f58,976e7ff..7af6e8f
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2017060100.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2017052500.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2017060500.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.