be tolerant
Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding
Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding