Next merged version probably won't be til tomorrow.

FYI: I don't think I'll be able to post a merge until tomorrow. I have a number of issues merging the changes (merge conflicts, and other stuff), and I'll be unable to do much more tonight.

--- David A. Wheeler