Sync changes from upstream repository
Merge pull request #570 from github/update-1406919173