Merge branch 'from-tomtucker' into for-2.6.26