Dear all,

the merge was surprisingly smooth: only 6 conflicts and all very easy to deal with. We can now forget about the strict branch and proceed working on the main trunk. Ciao

Roberto