Merge pull request #294 from eputnam/release_prep