Update POI
Merge pull request #865 from emmanuel-keller/1.5

Update POI