Merge branch 'release/1.0.35' v1.0.35
authorIan Weller <ian@gaslightmedia.com>
Thu, 3 Aug 2017 16:24:08 +0000 (12:24 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 3 Aug 2017 16:24:08 +0000 (12:24 -0400)

Trivial merge