Cleanup setting
Monkeypatch settings.TEMPLATE_STRING_IF_INVALID
Merge branch 'master' into suit