Merge branch 'hotfix/1.1.11' v1.1.11
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Apr 2016 20:47:02 +0000 (16:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Apr 2016 20:47:02 +0000 (16:47 -0400)

Trivial merge