Merge pull request #1 from eXist-db/develop

Experimenting with git-gflow
Merge pull request #2 from eXist-db/master

Merge pull request #1 from eXist-db/develop