Merge branch 'hotfix/1.0.14' master v1.0.14
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jun 2018 17:11:01 +0000 (13:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jun 2018 17:11:01 +0000 (13:11 -0400)

Trivial merge