Merge remote-tracking branch 'origin/master'

Conflicts:
	Reports/introduction/introduction.tex