Merge branch 'develop'

# Conflicts:
#	.gitlab-ci.yml

.gitlab-ci.yml

@@ -373,7 +373,7 @@ deploy-gitlab-github:
       -d "${GDX_DESCRIPTION}"
       -n "${GDX_RELEASE_NAME}"
     - sleep 10s # make sure the release is available to reference
-    - cp Release/gdxcclib64.dll apifiles/*.h apifiles/*.c apifiles/*.cpp .
+    - cp Release/gdxcclib64.dll apifiles/*.h apifiles/*.hpp apifiles/*.c apifiles/*.cpp .
     - cp Release/gdx-static.lib libgdx-windows.lib
     - |
       for fn in libgdxcclib64.so gdxcclib64.dll libgdxcclib64.dylib libgdx-macos.a libgdx-linux.a libgdx-windows.lib gclgms.h gcmutex.h gdxcc.h gdxcc.c gdxcwrap.hpp gdxcclib.cpp