Merge branch 'release/1.1.12' master v1.1.12
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Dec 2018 16:22:15 +0000 (11:22 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Dec 2018 16:22:15 +0000 (11:22 -0500)

Trivial merge