Merge

Merge from osbzr/bzrerp