Merge branches 'release', 'misc' and 'misc-2.6.25' into release