Merge remote-tracking branch 'refs/remotes/loou/mdj' into mdj
Merge remote-tracking branch 'refs/remotes/git1207.com/mdj' into mdj