issue #531: thanks to @guidoreina for bugfix suggestions!
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel