upstream/1.3.99.git20130510

Samuel Thibault

@sthibault

1eaeda16 · Merge remote-tracking branch 'upstream/master' into upstream · May 10, 2013

New upstream snapshot