ddbfd8 Merge branches 'users/jlee/master/for-next' and 'users/jslaby/master/for-next' into master

Merged and Committed by Michal Kubecek a year ago
    Merge branches 'users/jlee/master/for-next' and 'users/jslaby/master/for-next' into master
    
    Pull config update from Lee Chun-Yi.
    Pull config update from Jiří Slabý.
    
        
file modified
+6 -2
file modified
+1 -1
file modified
+1 -1
file modified
+6 -2
file modified
+6 -3
file modified
+6 -3
file modified
+6 -2
file modified
+1 -1
file modified
+6 -2