adapt to new pyretic master
Merge branch 'master' into pyretic-dev-version