0b2d813 Merge branch 'master' into f24

Merged and Committed by mattrose 7 years ago
    Merge branch 'master' into f24
    
    Pulling in vte291 requires update
    
        
file modified
+2 -3