Merge branch 'hotfix/1.2.29' v1.2.29
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 20 Jul 2017 15:40:53 +0000 (11:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 20 Jul 2017 15:40:53 +0000 (11:40 -0400)

Trivial merge