Merge branch 'hotfix/1.0.13' v1.0.13
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jun 2018 12:24:02 +0000 (08:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jun 2018 12:24:02 +0000 (08:24 -0400)

Trivial merge