Copy version number etc updates from trunk to 1.3 branch (they should