CON-Venus merge

Don't merge without https://github.com/Wikia/config/pull/671