Updated version number.
Merge remote-tracking branch 'origin/properties' into wip