Merge branch 'release/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Mon, 5 Feb 2018 21:11:00 +0000 (16:11 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 5 Feb 2018 21:11:00 +0000 (16:11 -0500)

Trivial merge