Merge branch '3.7-dev'