bf64aec Fix merge conflicts with master.

Merged and Committed by hobbes1069 4 years ago
    Fix merge conflicts with master.
    
        
file removed
-0
file added
+77
file modified
+13 -1
file modified
+1 -1