Sync changes from upstream repository
Merge pull request #611 from github/update-1412620545