Merge branch 'hotfix/1.0.31' v1.0.31
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Mar 2018 15:09:28 +0000 (11:09 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Mar 2018 15:09:28 +0000 (11:09 -0400)

Trivial merge