week 3 up to 3.4
Merge remote-tracking branch 'origin/etienne'