Merged in qulogic/gplugin/feature/gnu-install-dirs (pull request #1)
develop
2015-05-13, Gary Kramlich