Merge branch 'hotfix/1.0.15' v1.0.15
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 10 Dec 2018 14:09:31 +0000 (09:09 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 10 Dec 2018 14:09:31 +0000 (09:09 -0500)

Trivial merge