merge common code
Authored by: Jean-Francois Dockes 2016-11-15
Parent(s): [b3c64e]
Child(ren): [359510]