These changes are intended for inclusion in 3.6. Only critical fixes and bug fixes for things we merged during the 3.6 merge window are eligible to be merged after the merge window. If it can wait until the next release, I'll put in the pci/next branch instead.