rmichela Merge pull request #313 from salesforce/start-v1.2.5