Merge branch 'hotfix/1.6.34' v1.6.34
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 13 Apr 2017 14:54:07 +0000 (10:54 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 13 Apr 2017 14:54:07 +0000 (10:54 -0400)

Trivial merge