Bump version to 1.2.1 for release/quantal package
Merge branch 'master' into debian
Bump package version

Launchpad might hate this.