Fix for MacPorts.
Merge branch 'master' of github.com:jzienkiewicz/Pangolin