Update core/config.mk

Merge 4.2.2