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

Trivial merge