v3.6.1
a1067866 · Merge branch 'master' into release-3.6 ·