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

Trivial merge