Updated version string.
Merge branch 'master' into debian
New upstream release.