Merge pull request #1 from saltstack/develop

Update upstream