Merge pull request #741 from billhollings/Metal-3.0

Merge master 1.0.37 into Metal-3.0 branch.