Merge tag '1.0.5' into develop

tag 1.0.5