Merge tag 'v2.11.0' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Feb 2019 14:21:40 +0000 (09:21 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Feb 2019 14:21:40 +0000 (09:21 -0500)
Minor updates


Trivial merge