Merge branch 'hotfix/1.0.29' v1.0.29
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Mar 2018 15:17:04 +0000 (10:17 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Mar 2018 15:17:04 +0000 (10:17 -0500)

Trivial merge