Merge branch 'release/2.11.0' v2.11.0
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Feb 2019 14:21:27 +0000 (09:21 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Feb 2019 14:21:27 +0000 (09:21 -0500)

Trivial merge