v3.6
6a9fab76 · Merge branch 'master' into release-3.6 ·