merge error
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel