Merge branch 'hotfix/1.0.28' v1.0.28
authorLaury GvR <laury@gaslightmedia.com>
Fri, 12 Jan 2018 17:56:57 +0000 (12:56 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 12 Jan 2018 17:56:57 +0000 (12:56 -0500)

Trivial merge