v3.6.0
81caf772 · Merge branch 'develop' into stable ·