Merge tag '1.1.1' into develop

tag 1.1.1