WEB-4208 and WEB-4231 fixed and speced (where applicable)
Merge branch 'master' of github.com:EOL/eol