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