65e597d rebase to 0.7

Authored and Committed by jkastner 8 years ago
    rebase to 0.7
    
        
file modified
+1 -0
file modified
+8 -5
file modified
+1 -1