upstream/1.3.99.git20130311

Samuel Thibault

@sthibault

8c7386d2 · Merge remote-tracking branch 'upstream/master' into upstream · Mar 11, 2013

New upstream snapshot