Merge branch 'hotfix/1.1.11'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 20:49:35 +0000 (16:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 20:49:35 +0000 (16:49 -0400)

Trivial merge