Merge branch 'hotfix/1.0.36'
authorIan Weller <ian@gaslightmedia.com>
Tue, 12 Apr 2016 19:05:56 +0000 (15:05 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 12 Apr 2016 19:05:56 +0000 (15:05 -0400)

Trivial merge