Merge branch 'develop' into fix/mix-task-logging
authorMark Felder <feld@FreeBSD.org>
Wed, 20 Nov 2019 15:16:46 +0000 (09:16 -0600)
committerMark Felder <feld@FreeBSD.org>
Wed, 20 Nov 2019 15:16:46 +0000 (09:16 -0600)

Trivial merge