Commit 5ba07b9a0379f3c48b473bc3f4aa5293ea59931d

James Z.M. Gao 2013-04-19T09:03:41

Merge remote-tracking branch 'upstream/master'