Merge branch 'w02_MDL-37286_m25_tracebuffer' of git://github.com/skodak/moodle