upstream patch release 0.15.2 and patch to make tests run properly
fixup dumb merge issues
Merge pull request #5354 from herlo/master

upstream patch release 0.15.2