bugfix
Merge branch 'develop' into api

Conflicts:
	test/book.testnet