Merge "Update versions of addons"