merging 'develop' into master

[nickatnight]

No description provided.

[coveralls]

Pull Request Test Coverage Report for Build 85

• 69 of 69 (100.0%) changed or added relevant lines in 4 files are covered.
• No unchanged relevant lines lost coverage.
• Overall coverage remained the same at 100.0%

---

Totals
Change from base Build 80:	0.0%
Covered Lines:	86
Relevant Lines:	86

---

💛 - Coveralls

[coveralls]

Pull Request Test Coverage Report for Build 83

• 68 of 69 (98.55%) changed or added relevant lines in 4 files are covered.
• No unchanged relevant lines lost coverage.
• Overall coverage decreased (-1.2%) to 98.837%

---

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
django_spam/enums.py	44	45	97.78%

Totals
Change from base Build 80:	-1.2%
Covered Lines:	85
Relevant Lines:	86

---

💛 - Coveralls