Sync changes from upstream repository
Merge pull request #593 from github/update-1409690124