7th, by eclipse, by master
6th, by eclipse, by zeliliu
Merge branch 'zeliliu'