wonky, but working fix for #7147
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev