Second part of the fix (revision 13715) needs to be backported to 0.91.x, setting milestone to 0.92 for now.
Second part of the fix (revision 13715) needs to be backported to 0.91.x, setting milestone to 0.92 for now.