changes for 3.1
Merge branch '3.1'