Merge branch 'release/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 13:32:51 +0000 (09:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 13:32:51 +0000 (09:32 -0400)

Trivial merge