Merge branch 'release/1.0.35' v1.0.35
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 May 2017 20:34:24 +0000 (16:34 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 May 2017 20:34:24 +0000 (16:34 -0400)

Trivial merge