Merge addons-7.0 back in to master