Merge branch 'MDL-58230_master' of git://github.com/dmonllao/moodle

diff --cc mod/feedback/version.php
index 568383e,7251248..4f08c7e
--- 1/mod/feedback/version.php
--- 2/mod/feedback/version.php
+++ b/mod/feedback/version.php
@@@ -24,7 -24,7 +24,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $plugin->version   = 2017032800;       // The current module version (Date: YYYYMMDDXX)
 -$plugin->version   = 2016120511;       // The current module version (Date: YYYYMMDDXX)
++$plugin->version   = 2017032801;       // The current module version (Date: YYYYMMDDXX)
  $plugin->requires  = 2016112900;    // Requires this Moodle version
  $plugin->component = 'mod_feedback';   // Full name of the plugin (used for diagnostics)
  $plugin->cron      = 0;