Commit 57fcd07bddb1dc550ceded8ef3537de569c504c2

James Z.M. Gao 2013-04-16T10:28:12

Merge remote-tracking branch 'upstream/master'