Distribution: merging master into unstable