Sync changes from upstream repository
Merge pull request #616 from github/update-1412813572