cosmetic: whitespace
merge stable into default
tiny refactor: better function name
...and more sensible case order
merge stable into default
Merge in default.