Merge commit 'v2.6.39-rc2' into spi/merge