Merge branch 'hotfix/1.0.37' v1.0.37
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 8 Aug 2017 19:58:34 +0000 (15:58 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 8 Aug 2017 19:58:34 +0000 (15:58 -0400)

Trivial merge