1 1 stable

Hi,
I've made some changes that I would like to see in the next official release. They are described in the commit messages.
Please review and merge if everything's ok, or tell me if I have to change anything.
Warm regards