-stable review patch.  If anyone has any objections, please let us know.

------------------