Learn more about cloning repositories
You have read-only access
Add fixes that were mistakenly omitted from merge of pull request 1594 to 1.8 branch.
