Commit 473865db5039aec3417c0ba206af3923ba2b7e41

James Z.M. Gao 2013-04-18T08:48:48

Merge remote-tracking branch 'upstream/master'