Merge branch 'hotfix/1.0.34' v1.0.34
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 4 Apr 2016 18:25:00 +0000 (14:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 4 Apr 2016 18:25:00 +0000 (14:25 -0400)

Trivial merge