Merge branch 'hotfix/1.0.29' v1.0.29
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Feb 2018 17:01:12 +0000 (12:01 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Feb 2018 17:01:12 +0000 (12:01 -0500)

Trivial merge