Improve error reporting.
Add some debugging output for McHacki.
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
Correct debugging output for McHacki.