Merge remote-tracking branch 'origin/master' into Design
Textdocument mergetest
Putting the texts together