Pr4233 powerdump

Updated against upstream/master.

Fixed the spec so should `rake spec` without erroring