Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2020-07-25 20:04:10 -07:00