Merge branch 'hotfix/1.2.20' v1.2.20
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 20 Nov 2018 12:53:59 +0000 (07:53 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 20 Nov 2018 12:53:59 +0000 (07:53 -0500)

Trivial merge