20141118讨论结果
Merge remote-tracking branch 'origin/master'