Merging 6h & 6i

[Jeff Eastman]

Hi Grant,

 

I'm trying to figure out how to merge our two recent patches, do you
have a strategy?

 

Jeff