Merge remote-tracking branch 'origin/feat/templated-sourcehook' into …

…feat/templated-sourcehook

Sometimes my vast intellect... it scares me.

# Conflicts:
#	core/provider/source/provider_source.cpp