Merge remote-tracking branch 'origin/1.6' into 1.7

Conflicts:
	doc/sphinx/book/app/e_vinyl/index.rst
	doc/sphinx/book/box/atomic.rst
	doc/sphinx/book/box/box_schema.rst
	doc/sphinx/book/box/index.rst
	doc/sphinx/book/box/limitations.rst
	doc/sphinx/book/box/vinyl_diff.rst