Plus Edition compatibility
More Pro edition compatibility changes
Merge branch 'master' of github.com:raphaelm/opacclient