Sync changes from upstream repository
Merge pull request #595 from github/update-1410289528