Retroactively prepare 3.8.2

Looks like I forgot to push this up. A small amount of black magic will
be required to fix.