Merge pull request #2827 from xmcclure/profile-clean-0.1