Merge branch 'hotfix/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 24 Nov 2015 14:45:42 +0000 (09:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 24 Nov 2015 14:45:42 +0000 (09:45 -0500)

Trivial merge