Resolves #6237 for that particular error message
File bug api update
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
Merge branch 'dev' into test