Merge branch 'upstream' into snapshot/ubuntu/precise
Update debian/gbp.conf for snapshot builds.
Update changelog for 0.6.2-2~precise~1.gbpa57a97 release