Merge branch 'hotfix/1.0.42' v1.0.42
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 3 Nov 2015 14:07:14 +0000 (09:07 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 3 Nov 2015 14:07:14 +0000 (09:07 -0500)

Trivial merge