Merge branch 'hotfix/1.1.22' master v1.1.22
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Feb 2018 14:45:23 +0000 (09:45 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Feb 2018 14:45:23 +0000 (09:45 -0500)

Trivial merge