Making WPGrouse_NEW up to date with master

Learning to work with branches, hopefully this does not get pulled to Roots.io. :)