Merge branch 'hotfix/2.10.21' v2.10.21
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Feb 2018 15:01:35 +0000 (10:01 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Feb 2018 15:01:35 +0000 (10:01 -0500)

Trivial merge