Merge pull request #740 from pmcmaw/pdk_convert