Merge 3.0 changes back in to master before production deploy