Merge tag 'v1.2.54' into develop develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 21 Jan 2019 14:19:32 +0000 (09:19 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 21 Jan 2019 14:19:32 +0000 (09:19 -0500)
v1.2.54


Trivial merge