issue #461, #462
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel