Merge branch 'hotfix/1.0.20' v1.0.20
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Aug 2018 19:32:04 +0000 (15:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Aug 2018 19:32:04 +0000 (15:32 -0400)

Trivial merge