Merge branch 'release/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 22 May 2017 19:16:57 +0000 (15:16 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 22 May 2017 19:16:57 +0000 (15:16 -0400)

Trivial merge