Merge pull request #916 from david22swan/release_prep