Merge branch 'wip-MDL-57113-master' of https://github.com/kwiliarty/moodle