Sync changes from upstream repository
Merge pull request #542 from github/update-1403548069