Merge branch 'release/1.0'
Merge branch 'release/1.0.1'
Merge branch 'release/1.0'
Merge branch 'release/1.0.1'
Merge branch 'release/1.0.2'
Merge branch 'develop'
[Refs #4] The south triple is now correct for the EnumField
[Refs #4] Adding tests and south triple fixes to JSONField as well
[Refs #4] Adding tests and south triple fixes to JSONField as well
Merge branch 'hotfix/issue-4' into develop