Fixes #6679
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev