maintenance changes
concluding merge
Merge branch 'master' of https://github.com/matsim-org/book