Merge branch 'hotfix/1.2.9' v1.2.9
authorLaury GvR <laury@gaslightmedia.com>
Fri, 15 Dec 2017 22:01:41 +0000 (17:01 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 15 Dec 2017 22:01:41 +0000 (17:01 -0500)

Trivial merge