leave logout as _REQUEST for now
Merge branch 'master' into smf