Merge branch 'hotfix/1.0.20' v1.0.20
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Aug 2017 19:45:01 +0000 (15:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Aug 2017 19:45:01 +0000 (15:45 -0400)

Trivial merge