3.6.0
5f401f29 · Merge branch '3.6.x' into 3.x ·