Bump version.
Merge branch 'floorc_json'