Sync changes from upstream repository
Merge pull request #563 from github/update-1406574145