Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Nov 2017 17:47:49 +0000 (12:47 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Nov 2017 17:47:49 +0000 (12:47 -0500)
v1.0.4


Trivial merge