Sync 18.1 patch#36

JedMeister wants to merge 6 commits intoturnkeylinux-apps:masterturnkeylinux-apps/canvas:masterfrom

JedMeister:sync-18.1-patchJedMeister/canvas:sync-18.1-patchCopy head branch name to clipboard