Sync changes from upstream repository
Merge pull request #552 from github/update-1404760029