Merge pull request #1368 from wojnilowicz/pl