Merge branch 'release/1.1.12' v1.1.12
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Feb 2019 14:41:45 +0000 (09:41 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Feb 2019 14:41:45 +0000 (09:41 -0500)

Trivial merge