Merge branch '3.1/develop' into 3.1/master