(core) updates from grist-core

# Conflicts:
#	core/package.json