Merge remote-tracking branch 'origin/master' into destroy_autofools

Conflicts:
	dune/multiscale/tools/subgrid_io.hh