Merge branch 'exane-master'
fix spaces