Merge `waiting-for-debiankaios` back to `master`

@debiankaios @Zughy The recent developments happened on the waiting-for-debiankaios branch for both Tntrun and TNTTag because Zughy was being careful.

I think it may be time to merge it all back to master branch provided that you, debiankaios, have no problem with it.

This discussion is also about TNTTag