Merge branch 'hotfix/1.0.20' v1.0.20
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jun 2018 18:20:57 +0000 (14:20 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jun 2018 18:20:57 +0000 (14:20 -0400)

Trivial merge