5d84c71 bump to latest git, lots of fixes

Authored and Committed by adamwill 7 years ago
    bump to latest git, lots of fixes
    
    this has been running on staging for a while, via scratch builds.
    
        
file modified
+1 -0
file modified
+20 -12
file modified
+1 -1