Merge branch 'devel' of https://github.com/arangodb/arangodb-windows-libraries into devel