[MERGE] forward port of branch 7.0 up to 098c084

This commit is contained in:
Christophe Simonis 2016-01-26 18:09:05 +01:00
commit 43a4ffe6b6

Diff Content Not Available