Sync changes from upstream repository
Merge pull request #536 from github/update-1403024342