upstream/1.6+git20160311

Samuel Thibault

@sthibault

f1e52f82 · Imported Upstream version 1.6+git20160311 · Mar 11, 2016

Upstream version 1.6+git20160311