Apply commit 5c777af which got lost in previous release cycle
(relative to tag 5.3.6)
Bump version up, preparing next vote on release