2014-08-20 linyb 测试push
Merge remote-tracking branch 'origin/master'