General note to committers: I will be doing a final merge to the
release branch later this week so feel free to just commit to HEAD if
that's more convenient, unless its a bug fix to an active bug report
in which case it is probably a good idea to MFC it immediately.
-Matt