9c6ffb4 Merge downstream spec changes

Authored and Committed by frantisekz 4 years ago
    Merge downstream spec changes
    
    Including Python 2 Drop
    
        
file modified
+17 -53