Merge branch 'MDL-47466-master' of https://github.com/tehanuyor/moodle