Sync changes from upstream repository
Merge pull request #561 from github/update-1406325643