Merge branch 'master' into debian
Conflicts: debian/changelog
Authored by: Tony Houghton 2012-04-16
Parents: [c35fba][e00d7e]