合并 #2

Open
p6sjwxzk9 wants to merge 5 commits from lj_branch into master