Merge 2 years of develop branch changes from CForce, gpinkham and others into master

Merge 2 years of develop branch changes from CForce, gpinkham and others into master