Merge branch 'MDL-50313-master-featureidnumber' of git://github.com/mudrd8mz/moodle