1.4.0-beta2
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
fixed merge problem