Merge branches 'f.jeanneret105' and 'master'
vea