Merge branch 'hotfix/1.0.35' v1.0.35
authorIan Weller <ian@gaslightmedia.com>
Tue, 5 Apr 2016 14:10:50 +0000 (10:10 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 5 Apr 2016 14:10:50 +0000 (10:10 -0400)

Trivial merge