Merge branch 'pull/4'
Karen Etheridge [Sat, 14 Dec 2019 18:14:55 +0000 (10:14 -0800)]

Trivial merge