Merge branch 'hotfix/2.1.11'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:40:08 +0000 (17:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:40:08 +0000 (17:40 -0400)

Trivial merge