Merge branch 'hotfix/1.2.5' v1.2.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 19:34:46 +0000 (14:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 19:34:46 +0000 (14:34 -0500)

Trivial merge