Merge pull request #161 from apache/prepare-for-release

Minor updates before release