Merge branch 'release/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 9 Mar 2015 14:06:33 +0000 (10:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 9 Mar 2015 14:06:33 +0000 (10:06 -0400)

Trivial merge