Merge branch 'hotfix/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 19:58:16 +0000 (14:58 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 19:58:16 +0000 (14:58 -0500)

Trivial merge