Update the Makefile for the last merge.
Update Python path in Makefile.
Bump version and update ChangeLog for release.