Merge branch 'MDL-23514-master' of https://github.com/danielneis/moodle