sync with common
Authored by: Jean-Francois Dockes 2016-11-08
Parent(s): [1fdc46]
Child(ren): [8ba314]