Merge remote-tracking branch 'upstream/2.0' into 2.0
'201301290941'
Merge branch '2.0' of https://github.com/xkxf1293/goagent into 2.0