fix interpolation of pid
Merge pull request #104 from aspiers/pid-interpolation-fix

fix interpolation of pid
Merge branch 'release/roxy/master' into merge-roxy
Merge pull request #117 from vuntz/merge-roxy

Merge roxy branch into master