Merge branch 'hotfix/1.1.28'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Jun 2016 13:40:13 +0000 (09:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Jun 2016 13:40:13 +0000 (09:40 -0400)

Trivial merge