Merge branch 'hotfix/1.0.28' v1.0.28
authorLaury GvR <laury@gaslightmedia.com>
Tue, 2 Aug 2016 14:49:43 +0000 (10:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 2 Aug 2016 14:49:43 +0000 (10:49 -0400)

Trivial merge