Merge branch '3.6-dev' into 3.7-dev