First part of protection proof.
Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh