Merge branch 'release/2.2.0' v2.2.0
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 8 Jan 2019 18:49:00 +0000 (13:49 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 8 Jan 2019 18:49:00 +0000 (13:49 -0500)

Trivial merge