upstream/1.3.99.git20120923

Samuel Thibault

@sthibault

f42942ac · Merge remote-tracking branch 'upstream/master' into upstream · Sep 23, 2012

New upstream snapshot