Commit 19be0089000f507ce135d6aff1c26c6f2b236587

James Z.M. Gao 2013-04-19T08:55:13

Merge remote-tracking branch 'upstream/master'