Merge branch 'hotfix/1.0.39' v1.0.39
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 14 Feb 2017 16:25:20 +0000 (11:25 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 14 Feb 2017 16:25:20 +0000 (11:25 -0500)

Trivial merge