issue #1100
Merge branch '2.2' of https://github.com/triAGENS/ArangoDB into 2.2