Merge pull request #1040 from david22swan/release_prep