Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh
renamed struct attribute