Updating domain support on 3.6.11

Still need to hook in to promises