fix bug with diazo
Merge branch 'plip13476-mockup' into remove-dt-dl-dd

Conflicts:
	docs/HISTORY.txt