Merge pull request #1105 from Chris00/master

oasis2opam 0.3.4
oasis2opam 0.3.5