Post-release update.
Restore several to-be-updated sources to tip/master.