Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release