Merge changes from adamhl's refactoring of tools scripts

Merged Adam Lewenberg requested to merge adamhl into master

Merge request reports