Pull misc-2.6.39 into release branch