more coverage testing
Merge branch 'master' into salesforce