Sync changes from upstream repository
Merge pull request #547 from github/update-1404237638