Sync changes from upstream repository
Merge pull request #565 from github/update-1406593772