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

Mini bump version in merge...

diff --cc mod/data/lib.php
Simple merge

diff --cc mod/data/version.php
index 0e463c7,0e463c7..43d1f0e
--- 1/mod/data/version.php
--- 2/mod/data/version.php
+++ b/mod/data/version.php
@@@ -24,7 -24,7 +24,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
--$plugin->version   = 2016120502;       // The current module version (Date: YYYYMMDDXX)
++$plugin->version   = 2016120503;       // The current module version (Date: YYYYMMDDXX)
  $plugin->requires  = 2016112900;       // Requires this Moodle version
  $plugin->component = 'mod_data';       // Full name of the plugin (used for diagnostics)
  $plugin->cron      = 0;