sync shared code
Authored by: Jean-Francois Dockes 2017-03-27
Parent(s): [9e24b4]
Child(ren): [2f4f08]