Merge branch 'develop' getting back on track https://github.com/exist-db/exist into develop

vim message horray