Sync changes from upstream repository
Merge pull request #652 from github/update-1417482739