LD_LIBRARY_PATH hacked in for macports
Merge branch 'master' into develop