This includes the upstream commit and one new commit that I forwarded upstream that fixes build with 5.2.
This includes the upstream commit and one new commit that I forwarded upstream that fixes build with 5.2.