6b943ae sync with master upstream

Authored and Committed by dougsland 7 years ago
    sync with master upstream
    
        
file modified
+1 -0
file modified
+168 -91
file modified
+1 -1