Preparation for R3.7

Mostly header changes. GitHub update to test install script and roll in
a few more issues.