Merge branch 'hotfix/1.1.31' v1.1.31
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 22 Mar 2018 12:33:39 +0000 (08:33 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 22 Mar 2018 12:33:39 +0000 (08:33 -0400)

Trivial merge