fix tests
Fix one more spec that was broken by previous cuke fixes
error page translations
Merge branch 'master' into develop