Merge complete, tests passing.  Let's hope this all works.