Etherlab : Merged 2014-2018 changes from jblee and others

2019-11-25, Edouard Tisserant