Merge branch 'w31_MDL-28630_m22_cookie' of git://github.com/skodak/moodle