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