Merge branch 'release/1.1.5'
Merge branch 'release/1.1.6'
Added copyright
Merge branch 'master' into develop