Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 12 Sep 2017 15:14:53 +0000 (11:14 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 12 Sep 2017 15:14:53 +0000 (11:14 -0400)
v1.0.4


Trivial merge