Merge tag '1.1.2' into develop

tag 1.1.2