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

Trivial merge