Merge branch 'hotfix/2.2.2' v2.2.2
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 21 Jan 2019 21:43:45 +0000 (16:43 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 21 Jan 2019 21:43:45 +0000 (16:43 -0500)

Trivial merge