Merge branch 'hotfix/1.2.4' v1.2.4
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Jan 2019 20:02:21 +0000 (15:02 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Jan 2019 20:02:21 +0000 (15:02 -0500)

Trivial merge