Merge branch 'hotfix/1.0.26' v1.0.26
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Oct 2015 00:58:48 +0000 (20:58 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Oct 2015 00:58:48 +0000 (20:58 -0400)

Trivial merge