upstream/1.3.99.git20130624

Samuel Thibault

@sthibault

ef26e1ad · Merge remote-tracking branch 'upstream/master' into upstream · Jun 24, 2013

New upstream snapshot