Merge pull request #3066 from alexanderkyte/pedump_sgen