added new options
Merge branch '1.3' of github.com:triAGENS/ArangoDB into 1.3