Merge branch 'hotfix/0.9.6'
Merge branch 'release/0.9.7'
Merge branch 'release/1.0'
Minor patches to meadery model.

Looks like I need better tests.  This hotfix comes from production.
Merge branch 'hotfix/1.0.1' into develop