Developer 595

You'll want to grab the changes in aweplug as well.