Merge branch 'branch_get_attr'

Conflicts:
	interface/Process.h
	scripts/copy_histograms