cosmetic: whitespace
merge stable into default