Merge tag '1.0.4' into develop

tag 1.0.4