Merge branch 'release/1.2.50' v1.2.50
authorLaury GvR <laury@gaslightmedia.com>
Tue, 20 Nov 2018 14:05:35 +0000 (09:05 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 20 Nov 2018 14:05:35 +0000 (09:05 -0500)

Trivial merge