Sync changes from upstream repository
Merge pull request #541 from github/update-1403219786