final merge errors
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel