ddd5924 Rebase to 2.23 branch, commit 1a8a7c12950a0026a3c406a7cb1608f96aa1460e

Authored and Committed by fweimer 8 years ago
    Rebase to 2.23 branch, commit 1a8a7c12950a0026a3c406a7cb1608f96aa1460e
    
        
file removed
-47
file modified
+11 -5
file modified
+1 -1