merge nodebb update

merge nodebb update