Merge pull request #691 from billhollings/Metal-3.0

 Merge master 1.0.36 into Metal-3.0 branch.