issue 317
Merge branch 'issue317' of github.com:triAGENS/ArangoDB into 1.1

Conflicts:
	CHANGELOG