otec: refactoring plus a (currently ignored) test which I think simulates a potential problem
Merge branch 'master' of github.com:errai/errai into security