Merge branch 'wip-MDL-35874-stable23' of git://github.com/phalacee/moodle into MOODLE...