Merge branch 'release/1.0.14' master v1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Jan 2019 13:51:26 +0000 (08:51 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Jan 2019 13:51:26 +0000 (08:51 -0500)

Trivial merge