Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid'