upstream/1.6+git20160114

Samuel Thibault

@sthibault

527984fd · Imported Upstream version 1.6+git20160114 · Jan 13, 2016

Upstream version 1.6+git20160114