Merge branch '3.5-dev' into 3.6-dev