Merge branch 'hotfix/1.1.29' v1.1.29
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Aug 2017 13:20:48 +0000 (09:20 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Aug 2017 13:20:48 +0000 (09:20 -0400)

Trivial merge