Merge branch 'hotfix/1.0.40' v1.0.40
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 27 Oct 2015 18:52:58 +0000 (14:52 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 27 Oct 2015 18:52:58 +0000 (14:52 -0400)

Trivial merge