v2.6.0
dbf93222 · Merge branch 'ssarka-master-patch-21944' into 'master' ·