Merge branch 'cleanup-33' into 'master' See merge request [!131] [!131]: Nonestaging/dune-uggrid/merge_requests/131