Merge branch 'master' into deposit-add

# Conflicts:
#	doc/src/fix_deposit.rst
#	doc/txt/fix_deposit.txt
This commit is contained in:
Axel Kohlmeyer
2020-01-13 22:26:26 -05:00

Diff Content Not Available