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

Trivial merge