Commits in merkaartor/main:0.16-fixes