Merge branch 'hotfix/1.0.35' v1.0.35
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:07:32 +0000 (11:07 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:07:32 +0000 (11:07 -0500)

Trivial merge