Merge branch 'hotfix/1.0.29' v1.0.29
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 21 Dec 2018 16:57:37 +0000 (11:57 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 21 Dec 2018 16:57:37 +0000 (11:57 -0500)

Trivial merge