added code coverage via istanbul
Merge branch 'master' into salesforce