Sync changes from upstream repository
Merge pull request #603 from github/update-1411067991