Synchronise Python Bindings to 22 June 2014 build.
Latest changes to C++ code allow building with SWIG 3.0.2
Merge pull request #350 from fcr/master

Synchronise Python Bindings to 22 June 2014 build.