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

Trivial merge