Merge commit 'ecfccd487c249009b358269dadbd6d3d402d3873'

Conflicts:
	extra-addons/oph/oph/doc/README3.tex