Merge branch 'MDL-45574-m27' of https://github.com/sammarshallou/moodle into MOODLE_2...