Since you posted the original source (thank you!) I think we'll use your submission as the one to merge into, then re-up it.