OK, I found the SF page for all that stuff and took care of everything. Patch #1048075: https://sourceforge.net/tracker/index.php?func=detail&aid=1048075&group_id=5470&atid=305470