Merge branch 'release/1.2.38' v1.2.38
authorLaury GvR <laury@gaslightmedia.com>
Thu, 23 Aug 2018 19:23:07 +0000 (15:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 23 Aug 2018 19:23:07 +0000 (15:23 -0400)

Trivial merge