Sync changes from upstream repository
Merge pull request #615 from github/update-1412813197