Merge branch 'hotfix/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 31 May 2016 13:28:47 +0000 (09:28 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 31 May 2016 13:28:47 +0000 (09:28 -0400)

Trivial merge