Merge branch 'hotfix/1.0.42'
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Jul 2016 16:05:53 +0000 (12:05 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Jul 2016 16:05:53 +0000 (12:05 -0400)

Trivial merge