Please merge changes

Hello,

I've uploaded the pkg to unstable, seb128 told me it was OK for you.

Could you please merge this and take the tag as well?

Thanks