Merge branch 'hotfix/1.0.14' v1.0.14
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Nov 2018 16:36:15 +0000 (11:36 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Nov 2018 16:36:15 +0000 (11:36 -0500)

Trivial merge