Merge

Merge branch 'master' into main

# Conflicts:
#	DESCRIPTION
#	NEWS.md