One of the benefits of having a stable/15.7 is that we can mop up
after it in master leading up to a clean 16.1.  :)