8fa0ca7 Update to upstream 1.2.1 release

Authored and Committed by Jared K. Smith 6 years ago
    Update to upstream 1.2.1 release
    
        
file modified
+1 -0
file modified
+5 -3
file modified
+1 -1