All the 3.2 changes, "merged"

the easy way