Sync changes from upstream repository
Merge pull request #651 from github/update-1417443248