Sync changes from upstream repository
Merge pull request #579 from github/update-1408134721