upstream/2.1+git20100509

Mattia Rizzolo

@mattia

94a77eab · Import Upstream version 2.1+git20100509 · Sep 27, 2016

Upstream version 2.1+git20100509