added pxd to Manifest (to be included in source tarball)
Merge remote-tracking branch 'upstream/master'