Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 11 May 2017 12:48:03 +0000 (08:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 11 May 2017 12:48:03 +0000 (08:48 -0400)
v1.0.4


Trivial merge