Sync changes from upstream repository
Merge pull request #610 from github/update-1412388998