# Conflicts:
#	dune/stuff/test/common_string.cc

Fix some errors when HAVE_TBB is false

Thread-safe expression function

Remove entityptr from periodicview

Merge branch 'master' of https://github.com/wwu-numerik/dune-stuff into remove_entityptr_from_periodicview

Conflicts:
	dune/stuff/grid/periodicview.hh
	dune/stuff/test/grid_periodicview.cc

Conflicts:
	dune/stuff/functions/expression.hh

Conflicts:
	dune/stuff/common/string_internal.hh

resolved to remote version

Where applicable we now default to YaspGrids that can handle non-trivial
origin coordinates.

GridUtils now default to YaspGrid, which is now also the only
grid implementation guaranteed to be availabe for testing
if dune-grid is present

Profiler timing change

This reverts commit d44a7fc7de788da73e6e0673a79c3116646bc6d3.

Forgot to move that one.