Sync upgrades to 3rdparty Text::ParseWords and Text::DelimMatch from master