Merge branch 'hotfix/1.0.23' v1.0.23
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 22 Feb 2018 18:50:42 +0000 (13:50 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 22 Feb 2018 18:50:42 +0000 (13:50 -0500)

Trivial merge