upstream/1.6+git20160502

Samuel Thibault

@sthibault

3cc6fae2 · Imported Upstream version 1.6+git20160502 · May 02, 2016

Upstream version 1.6+git20160502