upstream/2.1.20140911

Frédéric-Emmanuel Picca

@picca

47e9d419 · Imported Upstream version 2.1.20140911 · Dec 31, 2014

Upstream version 2.1.20140911