[MERGE] forward port branch 8.0 up to 08213e831e

This commit is contained in:
Christophe Simonis
2017-03-24 17:07:03 +01:00
View File