diffusers

update code to reflect latest changes as of May 30th

#3616

Merged