Add cppo 0.9.4
Merge pull request #2227 from Drup/master

Add cppo 0.9.4