Work towards compatibility for 4.17 and 4.18#4

eslavich merged 4 commits intoeslavich:eslavich-no-patch-iter-errorseslavich/asdf:eslavich-no-patch-iter-errorsfrom

braingram:braingram-no-patch-iter-errorsbraingram/asdf:braingram-no-patch-iter-errorsCopy head branch name to clipboard