RR 2.5.5.2

a lone config tweak
Merge tag 'tags/v2.5.5.2' into server