b4c75f5 Pull in upstream fixes and improvements

Authored and Committed by jgrulich 8 years ago
    Pull in upstream fixes and improvements
    
        
file removed
-17
file modified
+7 -4
file added
+525