Further note to developers: feel free to drop your non-behaviour changing performance and correctness patches into the 3.8 branch, and your more aggressive work into master, both are now open to development again.