Merge branch 'hotfix/1.0.35' v1.0.35
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 23 Oct 2015 15:50:11 +0000 (11:50 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 23 Oct 2015 15:50:11 +0000 (11:50 -0400)

Trivial merge