Merge branch 'release/1.1.11' v1.1.11
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 21 Dec 2018 16:28:29 +0000 (11:28 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 21 Dec 2018 16:28:29 +0000 (11:28 -0500)

Trivial merge