Merge branch 'release/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Fri, 20 Apr 2018 15:40:14 +0000 (11:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 20 Apr 2018 15:40:14 +0000 (11:40 -0400)

Trivial merge