Bazaar-NG branch, format 6
