Merge branch 'release/2.1.0' v2.1.0
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 3 Dec 2018 17:37:43 +0000 (12:37 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 3 Dec 2018 17:37:43 +0000 (12:37 -0500)

Trivial merge