Sure wish I could test this bug without a full production deploy.
Merge branch 'master' into production