Merge branch 'hotfix/1.0.35' v1.0.35
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 16:06:48 +0000 (12:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 16:06:48 +0000 (12:06 -0400)

Trivial merge