Dependencies: merging master into unstable