Merge branch 'w35_MDL-35060_m24_sesstest' of git://github.com/skodak/moodle