Merge branch 'MDL-63603-INR' of https://github.com/danielneis/moodle