Merge branch 'release/1.2.4' v1.2.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 17:51:49 +0000 (12:51 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 17:51:49 +0000 (12:51 -0500)

Trivial merge