Merge branch 'release/1.1'
Merge branch 'master' of github.com:quarterto/Elessar