Merge branch 'hotfix/1.1.21'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 21:07:04 +0000 (17:07 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 21:07:04 +0000 (17:07 -0400)

Trivial merge