Merge branch 'dev' of https://github.com/facetoe/terminote2 into dev
Stuffed up commit message, tried to fix it with --amend, ended up here...