Merge branch 'hotfix/1.2.2' v1.2.2
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Feb 2019 18:18:09 +0000 (13:18 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Feb 2019 18:18:09 +0000 (13:18 -0500)

Trivial merge