Merge commit '5edf6a79d4587eedaca99608614e23c3a24736e1' into include-hack

Conflicts:
	src/devel/packages/refactor/prolog/ref_expand.pl
Just commited to preserve this version
Reverted experiments.