use setup version everywhere
Merge branch '3.1' into 3.2