Package: merging master into unstable