Sync changes from upstream repository
Merge pull request #575 from github/update-1407360288