Sync changes from upstream repository
Merge pull request #609 from github/update-1412100819