Sync changes from upstream repository
Merge pull request #558 from github/update-1406159713