Merge branch 'hotfix/1.1.29' v1.1.29
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Oct 2017 17:30:21 +0000 (13:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Oct 2017 17:30:21 +0000 (13:30 -0400)

Trivial merge