74fd030 Merge branch 'master' into f27

Merged and Committed by adamwill 6 years ago
0 file changed. 0 lines added. 0 lines removed.
    Merge branch 'master' into f27
    
    tkrizek sent the 4.6.0 bump commit to master and f27 branches with
    different commit IDs for some reason, merging back together with
    the 4.6.0-2 changes.