Merge branch 'master' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 30 Apr 2019 21:47:00 +0000 (17:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 30 Apr 2019 21:47:00 +0000 (17:47 -0400)

Trivial merge