Squashing and merging an update
Merge pull request #472 from github/update-1396638735

Opening a Pull Request for alternate updates