Merge branch 'release/1.0.29' v1.0.29
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Aug 2018 16:40:25 +0000 (12:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Aug 2018 16:40:25 +0000 (12:40 -0400)

Trivial merge