Merge pull request #415 from fcr/master

Bring Python bindings build up to date