Merge branch 'w36_MDL-35077_m22_stats' of git://github.com/skodak/moodle into MOODLE_...