Merge branch 'hotfix/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Oct 2015 19:14:14 +0000 (15:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Oct 2015 19:14:14 +0000 (15:14 -0400)

Trivial merge