Backport patch from master
Bump release number