607f451 Merge remote-tracking branch 'github/master' into f26

Merged and Committed by nphilipp 6 years ago
    Merge remote-tracking branch 'github/master' into f26
    
    Merge contents of both versions of README.md and get rid of Taiga
    references in the modulemd file in the process.
    
        
file modified
+19 -1
file modified
+3 -3