Merge pull request #239 from seemethere/bundle_me_up_1806

[18.06-ce] [ENGSEC-28] CVE-2019-5736 apply fix via git bundle instead of patches