merging 7 branch to master

[Tommaso Teofili]

hi all,

how about :
- moving the master branch into a 6.x branch
- merging 7 branch into master

This way we can support 6.1 with bugfixes and minor releases and go ahead
with development on version 7.

Regards,
Tommaso