Fixes
Merge branch 'master' of https://github.com/papyrus-project/papyrus