Merge branch 'release/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Fri, 27 Jul 2018 18:33:54 +0000 (14:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 27 Jul 2018 18:33:54 +0000 (14:33 -0400)

Trivial merge