Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	T7.1/O7.1.3_O7.1.7_O7.1.9/Evaluation_against_WP2.pdf
Integration of systemC section updated