Blocked 52535 from trunk for 8778 (pt_BR backport to 1.4). Already done here for...