20a347c Merge remote-tracking branch 'github/master' into f26

Merged and Committed by nphilipp 6 years ago
    Merge remote-tracking branch 'github/master' into f26
    
    In the process update references.
    
        
file modified
+24 -2
file modified
+3 -3