Merge branch 'hotfix/2.11.2' v2.11.2
authorSteve Sutton <steve@gaslightmedia.com>
Sat, 16 Feb 2019 11:17:44 +0000 (06:17 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Sat, 16 Feb 2019 11:17:44 +0000 (06:17 -0500)

Trivial merge