Merge branch 'hotfix/2.5.11' master v2.5.11
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 1 May 2018 20:40:01 +0000 (16:40 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 1 May 2018 20:40:01 +0000 (16:40 -0400)

Trivial merge