Sync changes from upstream repository
Merge pull request #528 from github/update-1402290482