Upstream changes: 1.81 2018-01-23 Restore 5.6 and 5.8 compatibility; Cope better in tests when @INC is humungous