upstream/1.6+git20151211

Samuel Thibault

@sthibault

c9aadea5 · Imported Upstream version 1.6+git20151211 · Dec 11, 2015

Upstream version 1.6+git20151211