Merge branch 'release/1.0.14' v1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Fri, 1 Jun 2018 17:01:33 +0000 (13:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 1 Jun 2018 17:01:33 +0000 (13:01 -0400)

Trivial merge