Update bzr_merge_addons-vauxoo_trunk_70