issue #350
Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into 1.1