2014-07-17单位台式机修改
Merge remote-tracking branch 'origin'