Merge branch 'hotfix/1.0.11' v1.0.11
authorLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 18:11:43 +0000 (14:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 18:11:43 +0000 (14:11 -0400)

Trivial merge