Merge tag 'v1.1.5' into develop

v1.1.5
Merge branch 'master' into develop