Merge pull request #859 from lionce/release_prep