Merge branch 'hotfix/1.2.1' v1.2.1
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Jan 2019 18:26:02 +0000 (13:26 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Jan 2019 18:26:02 +0000 (13:26 -0500)

Trivial merge