Merge branch 'release/1.2.38' v1.2.38
authorLaury GvR <laury@gaslightmedia.com>
Thu, 18 May 2017 14:17:31 +0000 (10:17 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 18 May 2017 14:17:31 +0000 (10:17 -0400)

Trivial merge