upstream/3.1-20140213

Sylvestre Ledru

@sylvestre

77b1adbd · Imported Upstream version 3.1-20140213 · Feb 19, 2014

Upstream version 3.1-20140213