Merge branch 'veyret' into devel