[MERGE] forward port branch saas-16 up to 745d00362a

This commit is contained in:
Christophe Simonis
2017-11-16 12:40:36 +01:00
35 changed files with 1814 additions and 624 deletions
File diff suppressed because it is too large Load Diff