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