Merge branch 'hotfix/1.0.11' v1.0.11
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 25 Sep 2015 15:32:07 +0000 (11:32 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 25 Sep 2015 15:32:07 +0000 (11:32 -0400)

Trivial merge