212e1b Fix merge related issues.

Authored and Committed by major a year ago
    Fix merge related issues.
    
    Update to 0.3.21. All trees merged into master.
        
file modified
+3 -0