Merge commit 'v3.6-rc5' into pci/gavin-window-alignment