upstream/1.3.99.git20130501

Samuel Thibault

@sthibault

ac107892 · Merge remote-tracking branch 'upstream/master' into upstream · May 01, 2013

New upstream snapshot