Merge remote-tracking branch 'origin/master'

Conflicts:
	trombinoscope/HugoStephan/cdnl1415hugo.html