Upped version number.
Merge branch 'master' into typescript_conversion