Merge branch 'for-1.3.2-ver2'