Pulling in code found in the Soar 8.5.2 release.