Merge pull request #633 from bhariharan/unstable

Merging back from 'master' to unstable
Bump up Javadoc version number