Just merged/dput upstream changes. Which, skipping log entries and such, change a single memcpy to memmove.
Did not do the download docs yet; I'm not sure if it can really be automated since their download snapshot system changes what extra goo is included every couple years.

