bf764db Update to the lastest master branch, with cherry-picking patches from 1.2 branch

Authored and Committed by mtasaka 7 years ago
    Update to the lastest master branch, with cherry-picking patches from 1.2 branch
    
      to revert some enhancement change on master
    
        
file modified
+1 -0
file modified
+15 -4
file modified
+1 -1