Ok.  It's ready for merging now.