Merge branch 'hotfix/1.1.11' v1.1.11
authorLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 20:37:40 +0000 (16:37 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 20:37:40 +0000 (16:37 -0400)

Trivial merge