Revision 3952

rel-2-1-3 was tagged on the wrong branch (MAIN), so this commit makes
rel-2-1-patches the same as rel-2-1-3, but in the correct branch. i will
then remove the tag rel-2-1-3 and re-tag rel-2-1-branches as rel-2-1-3.

THEN, I will add in the security fix, update the README, and tag
rel-2-1-4 for release.