Merge branch 'wip-MDL-32184-s23' of http://github.com/phalacee/moodle into MOODLE_23_...