Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2016-11-04 18:08:38
Author local date 2016-11-04 19:08:38 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2016-11-04 18:08:38
Committer local date 2016-11-04 19:08:38 +0100
Commit e283372f11ff5a4a47ff54cdb563abc67cb693ba
Tree 67de3e993ecbbfe35f98281d49ea5a88a08cf968
Parent 522b3eccd285c7d1a79aa18e2a5c3a9eff8c508f
Parent 44a113a95e721072609404e07d2ddd5b9e23dee6
Merged.
ViewGit