a7a236 - Merge with upstream

Authored and Committed by dwalsh 9 years ago
    - Merge with upstream
    
        
file modified
+1 -0
file modified
+134 -96
file modified
+5 -2
file modified
+1 -1