Merge pull request #2413 from KurdyMalloy/poco