Merge pull request #784 from pmcmaw/release_prep