Merge branch 'hotfix/1.0.15' v1.0.15
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Nov 2018 20:56:18 +0000 (15:56 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Nov 2018 20:56:18 +0000 (15:56 -0500)

Trivial merge