upstream/1.7+git20160809

Samuel Thibault

@sthibault

1251f73d · Imported Upstream version 1.7+git20160809 · Aug 09, 2016

Upstream version 1.7+git20160809