Merge branch 'hotfix/1.6.29' v1.6.29
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Mar 2017 15:37:34 +0000 (11:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Mar 2017 15:37:34 +0000 (11:37 -0400)

Trivial merge