dabb51c Rebase to 2.8

Authored and Committed by npmccallum 7 years ago
    Rebase to 2.8
    
        
file modified
+9 -3
file modified
+1 -1