upstream/1.3.99.git20121227

Samuel Thibault

@sthibault

ed7426b4 · Merge remote-tracking branch 'upstream/master' into upstream · Dec 27, 2012

New upstream snapshot