Merge branch 'hotfix/1.2.8' v1.2.8
authorLaury GvR <laury@gaslightmedia.com>
Fri, 15 Dec 2017 21:59:15 +0000 (16:59 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 15 Dec 2017 21:59:15 +0000 (16:59 -0500)

Trivial merge