Merge branch 'MDL-48947_v3' of https://github.com/Syxton/moodle