Merge branch 'refactorGLobjects' of file:///data/git-repository/acgl/libraries/acgl into refactorGLobjects