Merge develop into master

I feel ready for releasing a new version of Trivabble.

I made some fixes and improvements that I tried to document in the commit messages. We may need to test this a bit.

@lmazet I want to make sure you are okay with my latest changes.