Merge pull request #494 from mhaskel/cleanup-backports