Adirelle:
	- oUF: merged upstream changes.
