minqin,2014.10.18.14
Merge remote-tracking branch 'origin/master'