bd7b3cd Rebase and reapply accidentally dropped patches.

Authored and Committed by ellert 8 years ago
    Rebase and reapply accidentally dropped patches.
    
        
file modified
+138 -112
file modified
+18 -12