Merge branch 'hotfix/1.0.34' v1.0.34
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:48:00 +0000 (14:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:48:00 +0000 (14:48 -0400)

Trivial merge