Basic update from 3.0 to 4.6

Tested build and this is working.  Will submit pull request to upstream.