af2933a Re-synchronize master and f27

Merged and Committed by adamwill 6 years ago
    Re-synchronize master and f27
    
    There's really no need for them to diverge yet.
    
        
file modified
+1 -1
file modified
+4 -1