81651c8 Update to the latest master (with 2 patch from 1.2)

Authored and Committed by mtasaka 7 years ago
    Update to the latest master (with 2 patch from 1.2)
    
        
file modified
+1 -0
file modified
+95 -4
file modified
+1 -1