China to offer free pre-school education from autumn