Merge branch '3.1' into 5.2