merge 3.1.x down to master