Correctif sur un bug d'affichage rowspan/colspan.
Merge branch 'release-1.6.1' into release-1.6.2
Merge branch 'release-1.6.2' into release-1.6.3
Merge branch 'release-1.6.3'