Merge branch 'hotfix/1.2.18' V1.2.18
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 16:26:31 +0000 (12:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 16:26:31 +0000 (12:26 -0400)

Trivial merge