upstream/1.3.99.git20120505

Samuel Thibault

@sthibault

de7a8074 · Merge remote-tracking branch 'upstream/master' into upstream · May 05, 2012

New upstream snapshot