Merge branch 'MDL-66500-master-unoconvwarning' of git://github.com/mudrd8mz/moodle