Merge branch 'release/1.0.34' v1.0.34
authorIan Weller <ian@gaslightmedia.com>
Thu, 22 Jun 2017 21:03:40 +0000 (17:03 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 22 Jun 2017 21:03:40 +0000 (17:03 -0400)

Trivial merge