Remove useless USER opam
Merge branch 'master' into dev