Merge branch 'release/1.2.54' master v1.2.54
authorLaury GvR <laury@gaslightmedia.com>
Mon, 21 Jan 2019 14:19:27 +0000 (09:19 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 21 Jan 2019 14:19:27 +0000 (09:19 -0500)

Trivial merge