Merge branch 'hotfix/1.0.34' v1.0.34
authorIan Weller <ian@gaslightmedia.com>
Wed, 19 Apr 2017 16:45:09 +0000 (12:45 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 19 Apr 2017 16:45:09 +0000 (12:45 -0400)

Trivial merge