backported
3cd98f75 · Prepare for new release 0.15.22 ·