f150360 Update to upstream v1.6.7

Authored and Committed by jchaloup 6 years ago
    Update to upstream v1.6.7
    - resolves: #1468823
    - resolves: #1468752
    
        
file modified
+2 -3
file modified
+8 -6
file modified
+2 -2