Update develop branch to latest release

Merge changes for the Salesforce API v31 update to develop branch.