Sync changes from upstream repository
Merge pull request #532 from github/update-1402353875