Sync changes from upstream repository
Merge pull request #612 from github/update-1412625558