Merge branch 'release/2.10.11' v2.10.11
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Sep 2017 13:50:52 +0000 (09:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Sep 2017 13:50:52 +0000 (09:50 -0400)

Trivial merge