Merge branch '3.5-dev'