Extra spec, better redirect handling
Merge branch 'master' into b2b3