merge the feature/gtk-doc branch with ALL of the changes
develop
2018-05-07, Gary Kramlich