Merge pull request #36 from apache/tristan/more-release-fixes

more release fixes