Merge branch 'hotfix/1.0.34' v1.0.34
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 15:58:47 +0000 (11:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 15:58:47 +0000 (11:58 -0400)

Trivial merge