Merged in qulogic/gplugin/feature/meson (pull request #2)
develop
2017-06-02, Gary Kramlich