Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Nov 2017 21:30:30 +0000 (16:30 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Nov 2017 21:30:30 +0000 (16:30 -0500)
v1.0.4


Trivial merge