Merged changes to [pl] and [pt_BR]