8cda0c8 update to latest git, backport various fixes under review

Authored and Committed by adamwill 7 years ago
    update to latest git, backport various fixes under review
    
        
file modified
+2 -0
file added
+111
file added
+345
file added
+30
file modified
+21 -3
file modified
+2 -2