Merge branches 'release' and 'wmi-2.6.25' into release