v2.6.4
264b8977 · Merge branch 'master' into 'stable-2.6' ·