reformat code
Merge branch '3.2'