Merge branch 'MDL-53788_modlti_master' of git://github.com/nhoobin/moodle