Corrected error in deactivate field because the message was being translated
Merge branch 'master' into 150-unit-tests-newsletter-cms